Merge from emacs-24; up to r107969
authorChong Yidong <cyd@gnu.org>
Sat, 5 May 2012 04:35:47 +0000 (12:35 +0800)
committerChong Yidong <cyd@gnu.org>
Sat, 5 May 2012 04:35:47 +0000 (12:35 +0800)
commit29c31119c5b8013a225f5561ca078a1c550e735a
tree355ab441af2ec04a47f3cafa7b7ff5b6d073c82e
parent7236964b6162470880451f01a2852191742e5e96
parenta182019efa48885c64f1302f82fcbcca0aa3ec7e
Merge from emacs-24; up to r107969